projects
/
gtk4.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
210453b
)
Avoid another revert conflict
author
Matthias Clasen
<mclasen@redhat.com>
Sun, 1 Jun 2014 14:11:14 +0000
(10:11 -0400)
committer
Matthias Clasen
<mclasen@redhat.com>
Sun, 1 Jun 2014 14:18:38 +0000
(10:18 -0400)
Moving this bit up a few lines lets the following revert apply
cleanly.
gtk/gtktreeview.c
patch
|
blob
|
history
diff --git
a/gtk/gtktreeview.c
b/gtk/gtktreeview.c
index 868af44cf686e7580d9919b168befa4252a52013..8dd4e2be792d1b2e82a2e0e40697ecfb653bea91 100644
(file)
--- a/
gtk/gtktreeview.c
+++ b/
gtk/gtktreeview.c
@@
-475,12
+475,12
@@
struct _GtkTreeViewPrivate
guint hover_expand : 1;
guint imcontext_changed : 1;
+ guint in_scroll : 1;
+
guint rubber_banding_enable : 1;
guint in_grab : 1;
- guint in_scroll : 1;
-
/* Whether our key press handler is to avoid sending an unhandled binding to the search entry */
guint search_entry_avoid_unhandled_binding : 1;